Don't try to use xdgmime on Windows where we don't build it. (#157944, J.

2004-11-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilefilter.c: Don't try to use xdgmime on
	Windows where we don't build it.   (#157944, J. Ali Harlow)

diff --git a/ChangeLog b/ChangeLog
index f48edfe0c04ccf4240166faefd062b407cf71b7f..ac4a736aa01a737fbaec1f92bd83cab7d53dca11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-11  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilefilter.c: Don't try to use xdgmime on 
+       Windows where we don't build it.   (#157944, J. Ali Harlow)
+
        * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
        reserve space for the resize grip if the grip_window is not
        realized yet.  (#158010, Christian Persch)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f48edfe0c04ccf4240166faefd062b407cf71b7f..ac4a736aa01a737fbaec1f92bd83cab7d53dca11 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-11-11  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilefilter.c: Don't try to use xdgmime on 
+       Windows where we don't build it.   (#157944, J. Ali Harlow)
+
        * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
        reserve space for the resize grip if the grip_window is not
        realized yet.  (#158010, Christian Persch)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f48edfe0c04ccf4240166faefd062b407cf71b7f..ac4a736aa01a737fbaec1f92bd83cab7d53dca11 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-11-11  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilefilter.c: Don't try to use xdgmime on 
+       Windows where we don't build it.   (#157944, J. Ali Harlow)
+
        * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
        reserve space for the resize grip if the grip_window is not
        realized yet.  (#158010, Christian Persch)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f48edfe0c04ccf4240166faefd062b407cf71b7f..ac4a736aa01a737fbaec1f92bd83cab7d53dca11 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-11-11  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilefilter.c: Don't try to use xdgmime on 
+       Windows where we don't build it.   (#157944, J. Ali Harlow)
+
        * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Also
        reserve space for the resize grip if the grip_window is not
        realized yet.  (#158010, Christian Persch)

diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 561b6fa4d8ebc3cdf8735a6ce92fec0f45137d06..1a4769c70b27aa6e86c6e73c986d8f6f052a1be8 100644 (file)
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -26,8 +26,10 @@
 #include "gtkobject.h"
 #include "gtkprivate.h"
 
+#ifdef G_OS_UNIX
 #define XDG_PREFIX _gtk_xdg
 #include "xdgmime/xdgmime.h"
+#endif
 
 typedef struct _GtkFileFilterClass GtkFileFilterClass;
 typedef struct _FilterRule FilterRule;
@@ -406,7 +408,11 @@ gtk_file_filter_filter (GtkFileFilter           *filter,
        {
        case FILTER_RULE_MIME_TYPE:
          if (filter_info->mime_type != NULL
+#ifdef G_OS_UNIX
              && xdg_mime_mime_type_subclass (filter_info->mime_type, rule->u.mime_type))
+#else
+             && strcmp (rule->u.mime_type, filter_info->mime_type) == 0)
+#endif
            return TRUE;
          break;
        case FILTER_RULE_PATTERN: